Support "inbackend" in preferred content expressions

Well, actually, fix a typo that has always been in the implementation of
that. "inbacked" used to work, but let's not tell users about that; they
might try to use it and expect git-annex to keep supporting the typo..

Sponsored-by: Jack Hill on Patreon

diff --git a/Annex/FileMatcher.hs b/Annex/FileMatcher.hs
index 7a876debcc436c7ad7d088e47620798890522ea6..8f09658994f546db504e84a42bbd53bbac0bc4c7 100644 (file)
--- a/Annex/FileMatcher.hs
+++ b/Annex/FileMatcher.hs
@@ -180,7 +180,7 @@ preferredContentKeyedTokens pcd =
        , ValueToken "copies" (usev limitCopies)
        , ValueToken "lackingcopies" (usev $ limitLackingCopies False)
        , ValueToken "approxlackingcopies" (usev $ limitLackingCopies True)
-       , ValueToken "inbacked" (usev limitInBackend)
+       , ValueToken "inbackend" (usev limitInBackend)
        , ValueToken "metadata" (usev limitMetaData)
        , ValueToken "inallgroup" (usev $ limitInAllGroup $ getGroupMap pcd)
        ] ++ commonKeyedTokens

diff --git a/CHANGELOG b/CHANGELOG
index 9a202ccaf60c9bb1dc9b5d2df849bfd623ece78c..6cecf4d2503858585ebc018595343a4f6b595332 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-git-annex (10.20220823) UNRELEASED; urgency=medium
+git-annex (10.20220927) UNRELEASED; urgency=medium
 
   * Fix a bug in the last release that caused v8 repositories to upgrade
     immediately to v10, rather than taking the scheduled 1 year to do so.
@@ -43,6 +43,7 @@ git-annex (10.20220823) UNRELEASED; urgency=medium
     in a repository owned by another user.
   * p2p: Pass wormhole the --appid option before the receive/send command,
     as it does not accept that option after the command
+  * Support "inbackend" in preferred content expressions.
 
  -- Joey Hess <id@joeyh.name>  Mon, 29 Aug 2022 15:03:04 -0400
 

diff --git a/doc/git-annex-preferred-content/comment_6_f10a0c185fa2f2b4b8ec9fceaed6e8e1._comment b/doc/git-annex-preferred-content/comment_6_f10a0c185fa2f2b4b8ec9fceaed6e8e1._comment
new file mode 100644 (file)
index 0000000..11d9c25
--- /dev/null
+++ b/doc/git-annex-preferred-content/comment_6_f10a0c185fa2f2b4b8ec9fceaed6e8e1._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 6"""
+ date="2022-09-26T19:53:52Z"
+ content="""
+@rinomizu5 congrats, you found a bug!
+
+I've fixed this, so you'll want to upgrade to version 10.20220927 when
+it's released tomorrow.
+"""]]

diff --git a/git-annex.cabal b/git-annex.cabal
index bea054e907ab4afc32c1d43407ea51a2452c8418..6b902b116dc93b12babc7aeb16247503a5c17504 100644 (file)
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -1,5 +1,5 @@
 Name: git-annex
-Version: 10.20220822
+Version: 10.20220927
 Cabal-Version: 1.12
 License: AGPL-3
 Maintainer: Joey Hess <id@joeyh.name>